project--vc-list-files: Don't list conflicted files thrice

* lisp/progmodes/project.el (project--vc-list-files):
Use delete-consecutive-dups.

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 44259990bbf8aab7db1fc5c78ca70350b7e4f1e4..06e882b9f06b41567b2b531f6f0fdb0e5064bdce 100644 (file)
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -391,7 +391,9 @@ backend implementation of `project-external-roots'.")
                 submodules)))
          (setq files
                (apply #'nconc files sub-files)))
-       files))
+       ;; 'git ls-files' returns duplicate entries for merge conflicts.
+       ;; XXX: Better solutions welcome, but this seems cheap enough.
+       (delete-consecutive-dups files)))
     (`Hg
      (let ((default-directory (expand-file-name (file-name-as-directory dir)))
            args)